Revision: bazaar--devo--1.4--patch-68
Archive: thelove@canonical.com
Creator: Canonical.com Patch Queue Manager <pqm@canonical.com>
Date: Fri May 27 07:15:17 BST 2005
Standard-date: 2005-05-27 06:15:17 GMT
Modified-files: commands/annotate.c commands/cmdutils.c
    commands/cmdutils.h commands/resolved.c
    libarch/conflict-handling.c libarch/conflict-handling.h
    tests/test-conflicts.sh
New-patches: robert.collins@canonical.com--general/bazaar--devel--1.4--patch-103
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-104
    thelove@canonical.com/bazaar--devo--1.4--patch-68
Summary: resolved internal api tweaks, and slight ui planing. Fixes reported issue with resolved not resolving
Keywords: 

Patches applied:

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-103
   factor command line path selection out into arch_paths_from_user for resolved and annotate. Convert arch_unconflict files from a bitfield return to a enum return. Make resolved return an error when a non existent file is requested by the user

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-104
   fix occasional problems with resolved not finding the conflicted file by correctly escaping file names on output and unescaping on input, allowing comparison of canonical strings not escaped ones

